Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 26 May 2010 22:43:08 +0000 (22:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 26 May 2010 22:43:08 +0000 (22:43 +0000)
commit8d57228cf77051246220df40f1aa242c2b593ffc
treef468d911680c581b18568cc0d9e6cb4a4623769f
parentdc3d5fc4cfd1e680b77ad80c475e4c80e3ff0e8c
parent271189bc6690c96b9d0ba5ba9eba9d30a715b6bd
Merge from mainline.